From 6510bbf42ecbcfdb45b4b18a0c27e983ac1c95eb Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 30 Nov 2004 14:17:32 +0000 Subject: [PATCH] A little bit of microoptimization of repeated GDK_GC_XDISPLAY()/XGC(). Tue Nov 23 19:37:34 2004 Owen Taylor * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_flush): A little bit of microoptimization of repeated GDK_GC_XDISPLAY()/XGC(). --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gdk/x11/gdkgc-x11.c | 10 ++++++---- 5 files changed, 26 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21988d9a2b..dfd2533974 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Nov 23 19:37:34 2004 Owen Taylor + + * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_flush): A little bit + of microoptimization of repeated GDK_GC_XDISPLAY()/XGC(). + 2004-11-30 Matthias Clasen * NEWS: Updates. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 21988d9a2b..dfd2533974 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Nov 23 19:37:34 2004 Owen Taylor + + * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_flush): A little bit + of microoptimization of repeated GDK_GC_XDISPLAY()/XGC(). + 2004-11-30 Matthias Clasen * NEWS: Updates. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 21988d9a2b..dfd2533974 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Nov 23 19:37:34 2004 Owen Taylor + + * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_flush): A little bit + of microoptimization of repeated GDK_GC_XDISPLAY()/XGC(). + 2004-11-30 Matthias Clasen * NEWS: Updates. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 21988d9a2b..dfd2533974 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Nov 23 19:37:34 2004 Owen Taylor + + * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_flush): A little bit + of microoptimization of repeated GDK_GC_XDISPLAY()/XGC(). + 2004-11-30 Matthias Clasen * NEWS: Updates. diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c index 391c3deec1..f6e4e51a89 100644 --- a/gdk/x11/gdkgc-x11.c +++ b/gdk/x11/gdkgc-x11.c @@ -208,12 +208,14 @@ _gdk_x11_gc_new (GdkDrawable *drawable, GC _gdk_x11_gc_flush (GdkGC *gc) { + Display *xdisplay = GDK_GC_XDISPLAY (gc); GdkGCX11 *private = GDK_GC_X11 (gc); + GC xgc = private->xgc; if (private->dirty_mask & GDK_GC_DIRTY_CLIP) { if (!private->clip_region) - XSetClipOrigin (GDK_GC_XDISPLAY (gc), GDK_GC_XGC (gc), + XSetClipOrigin (xdisplay, xgc, gc->clip_x_origin, gc->clip_y_origin); else { @@ -226,7 +228,7 @@ _gdk_x11_gc_flush (GdkGC *gc) &rectangles, &n_rects); - XSetClipRectangles (GDK_GC_XDISPLAY (gc), GDK_GC_XGC (gc), 0, 0, + XSetClipRectangles (xdisplay, xgc, 0, 0, rectangles, n_rects, YXBanded); @@ -236,12 +238,12 @@ _gdk_x11_gc_flush (GdkGC *gc) if (private->dirty_mask & GDK_GC_DIRTY_TS) { - XSetTSOrigin (GDK_GC_XDISPLAY (gc), GDK_GC_XGC (gc), + XSetTSOrigin (xdisplay, xgc, gc->ts_x_origin, gc->ts_y_origin); } private->dirty_mask = 0; - return GDK_GC_XGC (gc); + return xgc; } static void -- 2.30.2